Optimisation of the search. Album filtering not working for some reason