single hive device + "fixes" for query params
fixes for server's controller