Fixed search no results bug
Fixed attribute list bug
Merge branch 'release/pianoman-c' into develop