Added Tour filter for several models, cleaned up forms, resolved N+1 queries