Fixed problems with empry results