fixed location comparator to avoid null pointer exception in case of unavailable user location
fixed location comparator to avoid null pointer exception in case of no available user location
merging issues.