Improved some match rule