Cleaned up find_by_tag a bit more
More find_by_instance_id cleanup