Fixed filters and added sort by date