Move uncategorized_properties scope to a better location.

In an effort to try and dry up the SQL.