Fixing required topic and state selector #112