Simplify rules by using is_partial
Remove special rule for 404