Added more filter methods, cleaned up controller