Add ^$ and optional play everywhere