fixed find by criteria