"No results" on local-data

+Code cleanup