Respect limit_to_holder in existing categories list, more efficient quer...

...ying. Missed that in my previous pull request.