Move search_marketplace variables into class scope