Changed querying to use datalist (well, RestrictedList)