changes to formatting on find_with_conditions