check module fix query
merge all