Fixed issue with search throwing JS error when returned data from server is null. Also added additional option for no results found