fix regexp matchers to get image filename correct