Added searching by short_name