Added fix to allow querying of sub board