Added FC2WODEntity and fixed up queries to allow for satelliteId