fixed filters pagination + some cleaning