added/updated regexes
fixed issue with books count query
Merge pull request #933 from Bart39/dev

added/updated regexes