Merge "Improve Special:BookSources validation and error messages"