Improved manufacturing query
fixed time issue