When creating a Device or User collection and editing the Query Statement it would be extremely useful to have all the Values applicable for the query that you create to be listed in a DataGrid instead of what's I'm assuming today is a ListBox or similar. A DataGrid would improve the user experience with sortable columns for instance.

As for the amount of returned items, it would also make sense to be able to increase the amount by allowing the user to set the maximum limit themselves.