Liquid placeholders and fixes

Liquid placeholders and fixes