Validation fixes & create search