Update filter to use extra fields
Removed user select sub feature
Cosmetic changes