Addresses #52 - Querying now optimized to only query what is needed
Inserted page number dummies for set search

Search needs to be implemented properly before this can be made fully
functional.
Merge with master