Added handler for Select fields criteria