More filtering tweaks; added a filter to bookie-data