Fixed some typo's.
Small refactorings on Filter controller and model.