Added FilterSelect for simpler implementation