Clean up code and add order field to quote product search