Fixing mongo query for boundarie, removing querying address at normalize service and changing the model