Add loading indicator and handler for special case of 0 results