Canvas fix

Added option to use custom parameter look up.