Empty filters bug fixed