Trying to fix raw query.