Cleaned up controller.
Added new type filters