cleaned up a little more code - made filter cancel work