Fixed errors experienced while selecting criteria