extract search
merge and model fix