Fourth time's the charm. Some more improvements by Michal Sojka, thanks. A few more opinions about whether or not to leave in the different filters for queries and counts, would also be very much appreciated.