Add no records found message to search
Merge branch 'release/1.0.4'