Consolidated FS queries and implemented hypermedia to some extent