added filtering based on category and neighbourhood