SRAMP-586 Empty custom property query not quite working