Finished and cleaned up rest of modal types for existing search params