Added beginnings of select attribute filtering