change tags to text for better filtering + improve controller