Fixed the query by attributes i.e the list option.
Merge branch '4.3'