Empty response and list improvements