add factory_method completion and fix tag method completion