fixing error from merge conflict
fixing more merge conflict problems
changing filter code in the controller due to the new designs filter implementation