DSSSM-364 #time 1h 23m Resolving issues with the returning of empty search results