Changed get___Internal methods to handle filters properly, and added test cases